From c5cb74f9eb7653dac8d5ebcec3c0ad54c7d56736 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Mon, 11 Apr 2005 17:56:17 +0000 Subject: [PATCH] bitkeeper revision 1.1287 (425aba41d9E1CIacFmT771MdoJl_LQ) Cull some duplicated code from nmi handling in entry.S. Signed-off-by: Keir Fraser --- xen/arch/x86/x86_32/entry.S | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S index cb3eabb104..c860e48937 100644 --- a/xen/arch/x86/x86_32/entry.S +++ b/xen/arch/x86/x86_32/entry.S @@ -573,16 +573,11 @@ do_watchdog_tick: movl %edx,%ds movl %edx,%es movl %esp,%edx - pushl %ebx # reason - pushl %edx # regs + pushl %ebx # reason + pushl %edx # regs call SYMBOL_NAME(do_nmi) - addl $8,%esp - movl XREGS_eflags(%esp),%eax - movb XREGS_cs(%esp),%al - testl $(3|X86_EFLAGS_VM),%eax - jz restore_all_xen - GET_CURRENT(%ebx) - jmp restore_all_guest + addl $8,%esp + jmp ret_from_intr defer_nmi: movl $FIXMAP_apic_base,%eax @@ -616,7 +611,7 @@ nmi_parity_err: nmi_out:movl %ss:XREGS_eflags(%esp),%eax movb %ss:XREGS_cs(%esp),%al testl $(3|X86_EFLAGS_VM),%eax - jz restore_all_xen + jz restore_all_xen movl $(__HYPERVISOR_DS),%edx movl %edx,%ds movl %edx,%es -- 2.30.2